From b6cc525fa098f0cade116e0dc29e5614237d48ab Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 3 Jul 2001 01:39:36 +0000 Subject: [PATCH] fix to use constants not atoms. 2001-07-02 Havoc Pennington * gdk/x11/gdkwindow-x11.c (gdk_wmspec_change_state): fix to use constants not atoms. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/x11/gdkwindow-x11.c | 10 ++++------ 8 files changed, 39 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ddcfcacf5..aadd7bd5b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-07-02 Havoc Pennington + + * gdk/x11/gdkwindow-x11.c (gdk_wmspec_change_state): fix to + use constants not atoms. + 2001-07-02 James Henstridge * gtk/gtktextview.c (gtk_text_view_class_init): same here for diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0ddcfcacf5..aadd7bd5b3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-07-02 Havoc Pennington + + * gdk/x11/gdkwindow-x11.c (gdk_wmspec_change_state): fix to + use constants not atoms. + 2001-07-02 James Henstridge * gtk/gtktextview.c (gtk_text_view_class_init): same here for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0ddcfcacf5..aadd7bd5b3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-07-02 Havoc Pennington + + * gdk/x11/gdkwindow-x11.c (gdk_wmspec_change_state): fix to + use constants not atoms. + 2001-07-02 James Henstridge * gtk/gtktextview.c (gtk_text_view_class_init): same here for diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0ddcfcacf5..aadd7bd5b3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-07-02 Havoc Pennington + + * gdk/x11/gdkwindow-x11.c (gdk_wmspec_change_state): fix to + use constants not atoms. + 2001-07-02 James Henstridge * gtk/gtktextview.c (gtk_text_view_class_init): same here for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0ddcfcacf5..aadd7bd5b3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-07-02 Havoc Pennington + + * gdk/x11/gdkwindow-x11.c (gdk_wmspec_change_state): fix to + use constants not atoms. + 2001-07-02 James Henstridge * gtk/gtktextview.c (gtk_text_view_class_init): same here for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0ddcfcacf5..aadd7bd5b3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-07-02 Havoc Pennington + + * gdk/x11/gdkwindow-x11.c (gdk_wmspec_change_state): fix to + use constants not atoms. + 2001-07-02 James Henstridge * gtk/gtktextview.c (gtk_text_view_class_init): same here for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0ddcfcacf5..aadd7bd5b3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-07-02 Havoc Pennington + + * gdk/x11/gdkwindow-x11.c (gdk_wmspec_change_state): fix to + use constants not atoms. + 2001-07-02 James Henstridge * gtk/gtktextview.c (gtk_text_view_class_init): same here for diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 31774a18d3..4124769952 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -1268,12 +1268,10 @@ gdk_wmspec_change_state (gboolean add, GdkAtom state2) { XEvent xev; - Atom op; - if (add) - op = gdk_atom_intern ("_NET_WM_STATE_ADD", FALSE); - else - op = gdk_atom_intern ("_NET_WM_STATE_REMOVE", FALSE); +#define _NET_WM_STATE_REMOVE 0 /* remove/unset property */ +#define _NET_WM_STATE_ADD 1 /* add/set property */ +#define _NET_WM_STATE_TOGGLE 2 /* toggle property */ xev.xclient.type = ClientMessage; xev.xclient.serial = 0; @@ -1282,7 +1280,7 @@ gdk_wmspec_change_state (gboolean add, xev.xclient.window = GDK_WINDOW_XID (window); xev.xclient.message_type = gdk_atom_intern ("_NET_WM_STATE", FALSE); xev.xclient.format = 32; - xev.xclient.data.l[0] = op; + xev.xclient.data.l[0] = add ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; xev.xclient.data.l[1] = state1; xev.xclient.data.l[2] = state2; -- 2.30.2